Merge from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:48:50 +0000 (16:48 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:48:50 +0000 (16:48 +0800)
commit05b222b19d1438cbcb48b9bafbe1c82cbe4ed251
tree8b83d2c54cc0b73e4af9245135dbfb0f583eed5f
parentf22f53e3fbe9e5fe675f6d92d44d3768bff99b66
parent3de95dae440a9539d9db75b3f49ed5146a76b497
Merge from emacs-24 branch
22 files changed:
ChangeLog
autogen/configure
configure.in
doc/lispref/ChangeLog
doc/lispref/files.texi
doc/lispref/help.texi
doc/lispref/keymaps.texi
doc/lispref/minibuf.texi
doc/lispref/processes.texi
doc/misc/ChangeLog
etc/ChangeLog
lib-src/ChangeLog
lisp/ChangeLog
lisp/battery.el
lisp/progmodes/gdb-mi.el
lisp/progmodes/grep.el
lisp/server.el
lisp/subr.el
lisp/window.el
src/ChangeLog
src/process.c
src/xdisp.c